debian: Include previous works in 1.0.4-5.

diff --git a/debian/changelog b/debian/changelog
index 3574f72e80480c343540f7404df835ac1e9d6b99..a480d1cc454f1349d31b1756d87fdbc65d9aac0a 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,13 +10,21 @@ opencc (1.0.5-1) unstable; urgency=medium
   * d/patches: Refresh patches.
   * d/changelog: Remove trailing spaces.
   * d/control: Use debian-input-method maillist in Maintainer field.
+    Closes: #899625.
   * d/control: Use canonical Vcs URL.
-  * d/control: Bump Standards-Version to 4.1.3.
+  * d/control: Bump Standards-Version to 4.1.4.
   * d/control: Bump debhelper compat to v11.
   * d/rules: Use NEWS.md as upstream changelog.
+  * d/rules: Use "dh_missing --fail-missing".
   * d/shlibs: Explicitly require the latest library version.
 
- -- Boyuan Yang <073plan@gmail.com>  Mon, 12 Feb 2018 09:30:54 +0800
+ -- Boyuan Yang <073plan@gmail.com>  Thu, 21 Jun 2018 11:07:39 +0800
+
+opencc (1.0.4-5) unstable; urgency=medium
+
+  * Make ocd data files arch:any (Closes: #851733)
+
+ -- Aron Xu <aron@debian.org>  Fri, 20 Jan 2017 15:15:35 +0800
 
 opencc (1.0.4-4) unstable; urgency=medium
 

diff --git a/debian/control b/debian/control
index d0f5e14f5a6c482688e4441443fd4aa309c9a3b0..56dd41001c8abdf0861d61858aaaf90cd9364c24 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -9,7 +9,7 @@ Uploaders:
 Build-Depends:
  cmake,
  darts,
- debhelper (>= 11),
+ debhelper (>= 11~),
  doxygen,
  libjs-jquery,
  libtclap-dev,
@@ -42,6 +42,8 @@ Depends:
  libopencc2-data,
  ${misc:Depends},
  ${shlibs:Depends},
+Breaks: libopencc2-data (<< 1.0.4-5~)
+Replaces: libopencc2-data (<< 1.0.4-5~)
 Description: simplified-traditional Chinese conversion library - runtime
  opencc is a library for converting character between traditional Chinese and
  simplified Chinese.
@@ -54,9 +56,11 @@ Multi-Arch: foreign
 Depends:
  ${misc:Depends},
 Breaks:
- libopencc-dev (<< 1.0.4-2),
+ libopencc-dev (<< 1.0.4-5~),
+ libopencc2 (<< 1.0.4-5~),
 Replaces:
- libopencc-dev (<< 1.0.4-2),
+ libopencc-dev (<< 1.0.4-5~),
+ libopencc2 (<< 1.0.4-5~),
 Description: simplified-traditional Chinese conversion library - data files
  opencc is a library for converting character between traditional Chinese and
  simplified Chinese.

diff --git a/debian/libopencc2-data.install b/debian/libopencc2-data.install
index c4a0cc83609d451104db7b031d73714f5ea6db6c..759378ea8c72d82e41ea3d8e4b1794017d4d37d7 100644 (file)
--- a/debian/libopencc2-data.install
+++ b/debian/libopencc2-data.install
@@ -1,3 +1,2 @@
 usr/share/opencc/*.json
-usr/share/opencc/*.ocd
 usr/share/opencc/doc/*

diff --git a/debian/libopencc2.install b/debian/libopencc2.install
index 3ddde584198421f0d2a3fef9d36cc110f3b8b76d..4e01c5355604f9de7cc4ad8bfe73fff0886f7386 100644 (file)
--- a/debian/libopencc2.install
+++ b/debian/libopencc2.install
@@ -1 +1,2 @@
 usr/lib/*/lib*.so.*
+usr/share/opencc/*.ocd

diff --git a/debian/rules b/debian/rules
index 7bbfc949fcb7a4c6c988d8d822b94b60df0e63de..74e90a318497d09913994aa9a3e02319cb2c1e69 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -33,3 +33,6 @@ override_dh_auto_clean:
 
 override_dh_installchangelogs:
        dh_installchangelogs -k NEWS.md
+
+override_dh_missing:
+       dh_missing --fail-missing